Skip to content

Conversation

wesleywiser
Copy link
Member

This is the backport of #62615

When `rustc` is invoked with the `--print` argument, we don't actually
generate any code (unless it's the `native-static-libs` option). So we
don't need to error our in this case since there's no risk of generating
either LLVM assertions or corrupted binaries.
@rust-highfive
Copy link
Contributor

r? @zackmdavis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 19, 2019
@zackmdavis
Copy link
Contributor

Is there some sort of special procedure for backport PRs, or is it just the usual "bors r+"? #62615 is labeled beta-accepted, so I'm going to assume there's nothing special.

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 19, 2019

📌 Commit d380987 has been approved by zackmdavis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 19, 2019
@wesleywiser
Copy link
Member Author

I don't believe there's anything special, no.

@Centril
Copy link
Contributor

Centril commented Jul 21, 2019

@bors p=-1 cc @pietroalbini for beta rollup?

@wesleywiser
Copy link
Member Author

@Centril I see the tree is currently closed but it would be great to get the into beta soon-ish so Mozilla can verify there's no other issues blocking them from using PGO in 1.37.

@Centril
Copy link
Contributor

Centril commented Jul 21, 2019

The tree is closed due to CI problems; See #62856 for the fix.

Pietro will do a beta backport rollup once the problems are gone.

@wesleywiser
Copy link
Member Author

Awesome, thanks so much!

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Jul 22, 2019
bors added a commit that referenced this pull request Jul 22, 2019
[beta] Rollup backports

Cherry picked:

* rustc_target: avoid negative register counts in the SysV x86_64 ABI. #62380
* Fix ICEs when `Self` is used in type aliases #62417
* Raise the default recursion limit to 128 #62450
* Handle errors during error recovery gracefully #62604
* Correctly break out of recovery loop #62607
* Cancel unemitted diagnostics during error recovery #62666
* ci: pin awscli dependencies #62856
* Ensure that checkout is with \n line endings #62564

Rolled up:

* [beta] Backport #62615 #62793
* [beta] Fix #62660 #62792

r? @ghost
bors added a commit that referenced this pull request Jul 22, 2019
[beta] Rollup backports

Cherry picked:

* rustc_target: avoid negative register counts in the SysV x86_64 ABI. #62380
* Fix ICEs when `Self` is used in type aliases #62417
* Raise the default recursion limit to 128 #62450
* Handle errors during error recovery gracefully #62604
* Correctly break out of recovery loop #62607
* Cancel unemitted diagnostics during error recovery #62666
* ci: pin awscli dependencies #62856
* Ensure that checkout is with \n line endings #62564

Rolled up:

* [beta] Backport #62615 #62793
* [beta] Fix #62660 #62792

r? @ghost
@bors bors merged commit d380987 into rust-lang:beta Jul 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants